From 1dd01afa43e9a313e578452bce21c41ea002f251 Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 7 Nov 2002 05:25:06 +0000 Subject: [PATCH] Rename TopoMapPro from tmp to tmpro. Thanx, Nick! Updated README.contib. --- gpsbabel/Makefile | 3 ++- gpsbabel/README | 9 +++++++++ gpsbabel/README.contrib | 28 ++++++++++++++++++++++------ gpsbabel/reference/topomappro.txt | 10 ++++++++++ gpsbabel/testo | 6 ++++++ gpsbabel/{tmp.c => tmpro.c} | 10 +++++----- gpsbabel/vecs.c | 8 ++++---- 7 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 gpsbabel/reference/topomappro.txt rename gpsbabel/{tmp.c => tmpro.c} (97%) diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile index 580942c96..b7c6294ad 100644 --- a/gpsbabel/Makefile +++ b/gpsbabel/Makefile @@ -2,7 +2,7 @@ CFLAGS=-g -Icoldsync FMTS=magproto.o gpx.o geo.o gpsman.o mapsend.o mapsource.o \ gpsutil.o tiger.o pcx.o csv.o cetus.o gpspilot.o magnav.o \ - psp.o mxf.o holux.o garmin.o ozi.o dna.o tpg.o tmp.o + psp.o mxf.o holux.o garmin.o ozi.o tmpro.o dna.o tpg.o JEEPS=jeeps/gpsapp.o jeeps/gpscom.o jeeps/gpsfmt.o jeeps/gpsinput.o \ jeeps/gpsmath.o jeeps/gpsmem.o \ @@ -63,6 +63,7 @@ psp.o: psp.c defs.h queue.h queue.o: queue.c queue.h route.o: route.c defs.h queue.h tiger.o: tiger.c defs.h queue.h magellan.h +tmpro.o: tmpro.c defs.h queue.h csv_util.h util.o: util.c defs.h queue.h vecs.o: vecs.c defs.h queue.h waypt.o: waypt.c defs.h queue.h diff --git a/gpsbabel/README b/gpsbabel/README index 1fc27f08e..3c148c9b0 100644 --- a/gpsbabel/README +++ b/gpsbabel/README @@ -213,6 +213,15 @@ THE FORMATS This format was contributed by Jochen Becker. + TMPRO + + TopoMapPro Places File. Reads and writes places files for use + in TopoMapPro (http://www.topomappro.com). As this file type + can store links other than web links, anything that is not a + http url will be discarded. Note that this does not do datum + conversions, so if your file does need WGS84/NZGD2000 data. + Colour of waypoint icons defaults to red. + COMMON USAGE diff --git a/gpsbabel/README.contrib b/gpsbabel/README.contrib index e9028ea34..798ef8aea 100644 --- a/gpsbabel/README.contrib +++ b/gpsbabel/README.contrib @@ -4,13 +4,29 @@ integration. Standards are good. ISO C and POSIX are greal preferred. -Reuse is OK, if not onerous. For example, using the expat libraries vastly - simplifies the XML parsers while increasing their robustness plus those - libraries are ubiquitous. So I consider it OK to require expat. +Reuse is OK, if doing so is not onerous. For example, using the expat +libraries vastly simplifies the XML parsers while increasing their +robustness plus those libraries are ubiquitous. So I consider it OK to +require expat. -If you contribute a new target, contribute a test case along with it. It's -not that hard and it helps us be sure that the next version of thie program -doesn't break your file format. +If you are creating a new target you should submit patches (use +"cvs diff -uN" to create patches) to the following files: +* Yourcode.c and/or Yourcode.h - this is the code required to do your + conversions and any support files that your code requires. +* vecs.c - an updated vecs.c file implementing your conversion code into + GPSBabel. +* Makefile - an updated Makefile telling the compiler how to build and link + your conversion into GPSBabel +* README - an excerpt for the README about your conversion and any + idiosyncrasies it may have. +* testo - an updated script that tests your conversion (this should produce + no output if all is good, see the current testo script for examples) +* YourOutput - a sample file of code produced by your function (used in testo + and lives in a directory called "reference"). + +Please ensure that you are building and testing against the latest code +from the top of the CVS tree and that any code you modify is the latest +version from the CVS - Note: code changes sometimes occur frequently! Compilers complain for a reason. Code shouldn't emit warnings. diff --git a/gpsbabel/reference/topomappro.txt b/gpsbabel/reference/topomappro.txt new file mode 100644 index 000000000..8318e5d0b --- /dev/null +++ b/gpsbabel/reference/topomappro.txt @@ -0,0 +1,10 @@ +Group sID sDescription fLat fLong fEasting fNorthing fAlt iColour iSymbol sHyperLink +new GCEBB Mountain Bike Heaven by susy1313 35.972033 -87.134700 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=3771 +new GC1A37 The Troll by a182pilot & Family 36.090683 -86.679550 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=6711 +new GC1C2B Dive Bomber by JoGPS & family 35.996267 -86.620117 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=7211 +new GC25A9 FOSTER by JoGPS & Family 36.038483 -86.648617 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=9641 +new GC2723 Logan Lighthouse by JoGps & Family 36.112183 -86.741767 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=10019 +new GC2B71 Ganier Cache by Susy1313 36.064083 -86.790517 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=11121 +new GC309F Shy's Hill by FireFighterEng33 36.087767 -86.809733 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12447 +new GC317A GittyUp by JoGPS / Warner Parks 36.057500 -86.892000 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12666 +new GC317D Inlighting by JoGPS / Warner Parks 36.082800 -86.867283 0 0 0.00 255 1 http://www.geocaching.com/seek/cache_details.asp?ID=12669 diff --git a/gpsbabel/testo b/gpsbabel/testo index 6f5aacc32..c0f481029 100755 --- a/gpsbabel/testo +++ b/gpsbabel/testo @@ -93,6 +93,12 @@ ${PNAME} -i mxf -f reference/mxf.mxf -o mxf -F ${TMPDIR}/mx.mxf ${PNAME} -i mxf -f ${TMPDIR}/mx.mxf -o mxf -F ${TMPDIR}/mxf.mxf diff ${TMPDIR}/mxf.mxf reference +# tmpro (TopoMapPro Places) file format +rm -f ${TMPDIR}/topomappro.txt ${TMPDIR}/mxf.mxf +${PNAME} -i tmpro -f reference/topomappro.txt -o tmpro -F ${TMPDIR}/tmp.txt +${PNAME} -i tmpro -f ${TMPDIR}/tmp.txt -o tmpro -F ${TMPDIR}/topomappro.txt +diff ${TMPDIR}/topomappro.txt reference + # TPG (NG Topo!) file format # This is hard to test as the datum conversions create minute # inconsistencies in the coordinates. So.. we test our i/o diff --git a/gpsbabel/tmp.c b/gpsbabel/tmpro.c similarity index 97% rename from gpsbabel/tmp.c rename to gpsbabel/tmpro.c index 2c2034030..a25df6081 100644 --- a/gpsbabel/tmp.c +++ b/gpsbabel/tmpro.c @@ -36,7 +36,7 @@ #include "csv_util.h" #include -#define MYNAME "TMP" +#define MYNAME "TMPro" static FILE *file_in; static FILE *file_out; @@ -140,7 +140,7 @@ data_read(void) case 10: /* URL is not a TopoMapPro format requirement. You can store file links etc, we will discard anything that is not http - (as URLs in TMP must start "http:") as other GPS formats probably can't + (as URLs in TMPro must start "http:") as other GPS formats probably can't use the TopoMapLinks links. (plus discards length 0 strings (so no empty XML tags)) */ @@ -175,7 +175,7 @@ data_read(void) } static void -tmp_waypt_pr(const waypoint * wpt) +tmpro_waypt_pr(const waypoint * wpt) { int icon = 1; /* default to "flag" */ int colour = 255; /*default to red */ @@ -242,10 +242,10 @@ data_write(void) /* Write file header */ fprintf(file_out, "Group\tsID\tsDescription\tfLat\tfLong\tfEasting\tfNorthing\tfAlt\tiColour\tiSymbol\tsHyperLink\n"); - waypt_disp_all(tmp_waypt_pr); + waypt_disp_all(tmpro_waypt_pr); } -ff_vecs_t tmp_vecs = { +ff_vecs_t tmpro_vecs = { rd_init, wr_init, rd_deinit, diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c index 309931f42..802bfe6f1 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.c @@ -49,7 +49,7 @@ extern ff_vecs_t tpg_vecs; extern ff_vecs_t dna_vecs; extern ff_vecs_t magnav_vec; extern ff_vecs_t xmap_vecs; -extern ff_vecs_t tmp_vecs; +extern ff_vecs_t tmpro_vecs; static vecs_t vec_list[] = { @@ -159,9 +159,9 @@ vecs_t vec_list[] = { "National Geographic Topo .tpg" }, { - &tmp_vecs, - "tmp", - "TopoMapPro" + &tmpro_vecs, + "tmpro", + "TopoMapPro Places File" }, { -- 2.30.2